Merging internal commits for release/8.0 #4926
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…release/8.0 Related to dotnet#4844 I resolved conflicts in favor of dependency flow change in the internal branch - https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/commit/0dad47b40c489631d0d3e7c6cc10f0035590a17c?refName=refs/heads/internal/release/8.0&path=/NuGet.config ---- #### AI description (iteration 1) #### PR Classification Manual merge from AzDO release/8.0 to AzDO internal/release/8.0 #### PR Summary This pull request includes a manual merge and updates to the Tizen toolchain configuration and various dependency versions. - `eng/common/cross/toolchain.cmake`: Refactored Tizen toolchain path handling to dynamically find the version subdirectory. - `eng/Version.Details.xml`, `eng/Versions.props`, `global.json`: Updated various Microsoft.DotNet dependencies to newer versions. - `eng/common/tools.ps1`, `eng/common/tools.sh`: Changed Azure feed URL for dotnet builds. - `eng/pipelines/jobs/prepare-signed-artifacts.yml`, `eng/pipelines/jobs/windows-build-PR.yml`, `eng/pipelines/jobs/windows-build.yml`: Updated MicroBuildSigningPlugin task version from 2 to 4.
…ng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 8.0.12 to 8.0.13 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.12 to 8.0.13 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3 (parent: Microsoft.DotNet.Wpf.GitHub)...
…-merge-8.0-2025-02-11-1225
mmitche
approved these changes
Feb 12, 2025
This was referenced Aug 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.